From 796ae50064d5f82afdd36ac0168b350b087e0507 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 10 Dec 2012 16:51:31 -0800 Subject: [PATCH] Fix compilation on MacOSX Tiger NSInteger isn't defined until MacOSX Leopard, so in the 3 files that use it, include ../gdk/quartz/gdkquartz.h which provides a typedef when needed. --- gtk/gtkclipboard-quartz.c | 4 ++-- gtk/gtkdnd-quartz.c | 1 + gtk/gtkmodelmenu-quartz.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c index 046fe71ccf..9179c734dc 100644 --- a/gtk/gtkclipboard-quartz.c +++ b/gtk/gtkclipboard-quartz.c @@ -31,7 +31,7 @@ #include "gtktextbuffer.h" #include "gtkselectionprivate.h" #include "gtkquartz.h" - +#include "../gdk/quartz/gdkquartz.h" enum { OWNER_CHANGE, @@ -47,7 +47,7 @@ enum { typedef struct _GtkClipboardClass GtkClipboardClass; -struct _GtkClipboard +struct _GtkClipboard { GObject parent_instance; diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c index 9f13e5fffd..5760105570 100644 --- a/gtk/gtkdnd-quartz.c +++ b/gtk/gtkdnd-quartz.c @@ -41,6 +41,7 @@ #include "gtkquartz.h" #include "gdk/quartz/gdkquartz.h" #include "gtkselectionprivate.h" +#include "gtksettings.h" typedef struct _GtkDragSourceSite GtkDragSourceSite; typedef struct _GtkDragSourceInfo GtkDragSourceInfo; diff --git a/gtk/gtkmodelmenu-quartz.c b/gtk/gtkmodelmenu-quartz.c index a5a73ecdcc..2f05eac7d0 100644 --- a/gtk/gtkmodelmenu-quartz.c +++ b/gtk/gtkmodelmenu-quartz.c @@ -23,6 +23,7 @@ #include #include "gtkaccelmapprivate.h" #include "gtkactionhelper.h" +#include "../gdk/quartz/gdkquartz.h" #import -- 2.30.2